Merge changes from topic "b23270724" into lmp-dev am: 5802bad0f4
am: 49acc79a1d  -s ours

Change-Id: I5546162289546690501066c8e5dfd1d7c6e5ea65