Merge "Merge "Allow shell to set log.tag.* properties" into nyc-dev am: a34afee0 am: 39423a91" into nyc-mr1-dev-plus-aosp