Merge changes from topic "log-taps" into rvc-dev am: 81f5ea4077

Change-Id: Id030f52afb36a2355c0a3bb32d5e06cd13e92c51