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

Change-Id: Id7378c2c0b257d963747e4529a4981c9182b4262