am: 4ccfceca -s ours Change-Id: Ied8d163ad614cca8e8385c8ea528119c213158a3
mentioned in commit f0338d36