Created as manual cherry-pick for http://ag/866007 to lmp-mr1-release

Change-Id: Ic7519c3f888c548446e5058a628c2d10bad1db6a
1 file changed