Snap for 6554163 from e7f0f04ea1c03cf608c7321b73c16f3c9497973e to mainline-release

Change-Id: I7e99b8fac5fc13f58d2789a88e6aa7535d64522d