Merge changes from topic "am-8610f88571b243f4a251e87b3a45c870" into qt-qpr1-dev-plus-aosp am: 813d4aa436

Change-Id: Ie2032eabc4e3aa85b75fa7f0d62b26d326a07b8d