Merge "Fix build breakage caused by commit 940829f69b52d6038db66a9c727534636ecc456d." into lmp-dev am: 7a66bd2404 am: c776d9b42f am: 06985c1dbc
am: a25f2f5359

Change-Id: I41c1d70146910fc39926c7fcd1951863f8e967e1