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

Change-Id: I202194b9bf1167ab437eb18edd548512e6713bff