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

Change-Id: I3c90e36a8bd1992780a3996c7d16c760df4968cd