Merge mainline-release 6664920 to master - DO NOT MERGE

Merged-In: I9f5e61b45c8df78a03c455efa6102ad7b501e78b
Change-Id: I36463ff8c97b5c3485c41426c001a07446503dc6