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

Change-Id: Ic803ae979be554f80afb4179b29563bf656b1eca