am: 0a12519f Change-Id: I95b8bf0d29e80303319bdf0921c58f408dfb6f74
mentioned in commit 066c725c
mentioned in commit ae64f453