Merge "Remove dead code am: ab63fd3c25 am: 3370e6cfb9" into qt-r1-dev-plus-aosp