Merge "resolved conflicts for merge of 9ef2ec9b to lmp-dev-plus-aosp" into lmp-dev-plus-aosp