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

Change-Id: I22cefdd83cc27dcf6ba32c568e808450121969d6