Bug: 120848293 Change-Id: I8158871421238f1e7f4aacd73fe050ce7094406f
mentioned in commit 3a76a940
mentioned in commit 0924d82a