Merge changes from topic "b123318663" am: b79e8ed24b
am: 49d0c3db22

Change-Id: I152b75a8ae31e6649d80e6c70273f06376fabdbf