Merge "Merge "Remove unused class" am: 09f6675744 am: 04ecb95ea9 am: 15199a5868" into qt-r1-dev-plus-aosp
am: 7d84adaf44

Change-Id: I771fadd49889a0906a304c20d5ad5f7a7e25e3bb