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

Change-Id: I8f7ca210b5c8e2f19105fc20427b3d428843a8b0