Merge "Fix tiny typo in LOG_TAG." am: d7c8bda2f9 am: 1d5a1e4d39
am: 1fc161bca8

Change-Id: Ie756a3d0c6f39784fd5f679e8a8dda084c548583