am: c6f7eac2 Change-Id: I85571273a84d0cf8919c1ed36daaab99502ca8f0
mentioned in commit 410f6b0b
mentioned in commit 3360bf93