Snap for 6660892 from f6ca211db93e24351a138d2c3f17a81be5cacbd1 to mainline-release

Change-Id: If4d858e342c83e8d49ae04e5987844ff325a19d1