Change-Id: I1f8c7bf6b24bcc38c8b62deb2259106874689802 BUG: 129345239
mentioned in commit bb5d8d13
mentioned in commit cf5ead32