Merge changes from topic 'system-vendor-internal-pick' am: 3dfaa44491 am: 004f8f9633 am: 0f8be50eca
am: 4acb166bae

Change-Id: Ibe780d1259cc5d441b144e3b68e35d559314228d