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

Change-Id: Ie692b035ea102dbeccb0e8472cd103a804920455