Merge changes from topic "b123318663"
am: b79e8ed24b

Change-Id: I1dd411ec0e693a59618b053fa88c220e1641fc22