[automerger skipped] Merge "DO NOT MERGE Rename classes to match master" into...
[automerger skipped] Merge "DO NOT MERGE Rename classes to match master" into qt-qpr1-dev am: be8186cc -s ours
am skip reason: Change-Id I81ad0c324dab64913b943a20b3e9e30e344b0c92 with SHA-1 40e8f7af is in history
Change-Id: I5963b20f54c65ad4e52004a857cde615d11194cd