Merge "Add feature flag for b/110953234 fix." am: b59a38d343 am: 7eb902712b
am: 933b51fdf6

Change-Id: If839d25c9cab731e745276af68ffb8c175d2d9d0