[release] Snap to 1c6ed573df
Change-Id: Ia35d9bf80d8048b40f1035eeba918c85007bb63a