Merge "Standardize logging to ALOG[x] macros"
am: 2adc093e39

Change-Id: Ic01199537b660be60c54be941fab6f622911ef37