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

Change-Id: If459d63cec4a9d1ac45694428be406ea566c1fc9