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

Change-Id: If16e42a5cf44acd1f6dccbd1e54d9d1fafeba4a5