Merge remote-tracking branch am: 5cd50f8f55 am: 1b81dfea33
am: d24dcc2703

Change-Id: Id1019683bf537081d3ee9f3c5f8e11cf73d65828