Merge "Bug: 14081161 Adding acknowledgement for b/22214934"