am: e4dedcd0 -s ours Change-Id: Ifb62f27594efc75a9a227a3b302fdaab79eec0da
mentioned in commit 322c59d7
mentioned in commit a4b74686