Snap for 6315035 from db85e832fd22cbfb8a8972d478a6f7d1dc1e8ea7 to mainline-release

Change-Id: Ifb54039e2fd9405e69d9c9c2ac7da22f631143ee