Merge "Added mitigation for b/122921367"
am: 80c398b74c

Change-Id: I29c437ba51ff3f4cc90671a0581f41a70581d5a8