Change-Id: Icb2327285c65bc656e35d37183cc42af3eb72138
ORIGINAL_AUTHOR=Thai Duong <thaidn@google.com>
GitOrigin-RevId: b37b6c3013ada55d92666b303fa109842a60bda9