Other projects in lmp-preview-dev are out of date, and it's easier to patch bionic than to fix all of them. (cherry picked from commit a856c6f543) Change-Id: Id8fbdf35eb55150579f85b7bdddb5d68d3012218
a856c6f543
9eb2d38d
b9fdad77
ec81b4a3