Merge changes from topic "am-cf4a2ab68f0040a6a3e8c5831f3c9efc" into qt-qpr1-dev-plus-aosp
am: 31d2ec103d

Change-Id: I8f17dbc368ca5281fc5095085681765916a87fb1