Snap for 6637022 from b54facd64be38c6f161ceb4a45450fb86f4eeed9 to mainline-release

Change-Id: I4691928440f181e3e2664e40d82df81988ede1be