Merge changes from topic "am-5c11475d0afe4ea1825e10d547757408" into qt-qpr1-dev-plus-aosp
am: 0892a932df

Change-Id: I09c5139a805b018ad68464c78a3c171443cc0916