[automerger skipped] Merge "Remove unnecessary code and masking" am:...
[automerger skipped] Merge "Remove unnecessary code and masking" am: f8806347 am: 32343e7f -s ours
am skip reason: Change-Id I5e2fee495210fc23d611350aa3c9c5e37e6ba58e with SHA-1 fe76f264 is in history
Change-Id: Iff72ff278280bd7d48eda28c6729b192ee93d3ea