Merge remote-tracking branch am: c853e41638
am: f0cbfa805a

Change-Id: Id449cec8b392ab88b71e50caa29cac527aa5055c