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

Change-Id: Ic4b5f779543f385fef19d7eaa7afa8af75d2a5a1