[automerger skipped] Merge changes from topic "vendor_skus" into rvc-dev am:...
[automerger skipped] Merge changes from topic "vendor_skus" into rvc-dev am: 282bb789 am: 1f78009a -s ours
am skip reason: Change-Id Ia0655fd4d37f6286b164a3221ec4b2716f29147d with SHA-1 174b5be0 is in history
Change-Id: Ibb11c4907a8264038cfc8b3bad31b393cebccdec