Snap for 6561534 from 1d615089ea29a4a34a604364493a0db071af0a1b to mainline-release

Change-Id: I4b274b574057b3c2046fb5ef3b9df6aa4d6c8681