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

Change-Id: Ifb53b5e715b1e66a0af4afee54be9133e4c3b198