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

Change-Id: I66c20440674cc1c15f9e10e89b563e0c8a53213d