am: 6fc9b087 -s ours Change-Id: Ib8ddbb55d91746c2ee3f649b0248a111a8f604e6
mentioned in commit f01730af
mentioned in commit 6ef5ef7b