Snap for 6838321 from 7667949ef116d3e5eca5ad3d0fc17074472f201c to mainline-release

Change-Id: I95dc8c2f9775525bdcbc3ecfe85b4f1bbd49b7d0