Snap for 6643974 from d1c75f1d89e1bcedf46f968ac86759f958951ff0 to mainline-release

Change-Id: I37e0fb3ec6d22e3fa19507ed3143bf1bac4f9650