Merge "Fix LOG_TAG and typo."
am: e821b67b98

Change-Id: I17c96a471d9a26e2155de6eafce9f3a9d740e5eb