Merge "Add feature flag for b/110953234 fix."
am: b59a38d343

Change-Id: I355b5cef9e673efcb545ed54c8bcd408c9ec57d0