Change-Id: I02fa35a961479af2a5abc7c9c4d46b5b538c09d6 BUG: 129345239
mentioned in commit 2edae8e5
mentioned in commit 9ae3d0e6