Merge "Merge "Allow shell to set log.tag.* properties" into nyc-dev am: a34afee0 am: 39423a91" into nyc-mr1-dev-plus-aosp am: 3936efc1 * commit '3936efc1': Change-Id: Iddf4994f8d8434637cd045c151c453409478b2e4