am: a69712a8 Change-Id: I0137a37ab05e52410bc2db65123bffeebaacffa3
mentioned in commit ad3bc9a4
mentioned in commit 9fce248a