Merge mainline-release 6664920 to master - DO NOT MERGE

Merged-In: I42fd0c1e3eb37654bb1cca849337008f726309e8
Change-Id: I23666b51f76a53f5aafcc4c3516003ac488d0c2f