Merge changes from topic "am-90f3bc3d5bbe49498428b40defa6b5a1" into qt-qpr1-dev-plus-aosp am: cd9e71744e

Change-Id: I2e3fe45cf89e8df7a305fb9cf6f926e99378d637