Merge mainline-release 6664920 to master - DO NOT MERGE

Merged-In: Ie5bbc8016e0bbb155e411f164c755f1905d49295
Change-Id: I3aa42cc7bd77e7ee42ed7bdbd267e346b691f923