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

Change-Id: I9e782c46d9ddf43b61c8feb5e2c33f2a295e8358