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

Change-Id: Ieb2c1441aa132a04b05cd178eddc561d98b06711