Merge changes from topic "verbose-vendor-logging"
am: b6069dcb3c

Change-Id: I4730f8e7ace90a09ad4247d9d338e02cf7c9e917