Bug: 242648940 Merged-In: I351a2dfae53e3bd5e32d484acc3504bf7f48b76d Change-Id: I2a2bb22e28a0ba74c8fc8d644ab3b3e47def386f