am: 0699c4cf Change-Id: I4d179d8a88b39e62344d3e328505588b8ecc1a67
mentioned in commit 5d09bc7b
mentioned in commit 7bdd3f25