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

Change-Id: I3265aee42b89b18cdc3be5d374e25897f15be208