am: fe4512e2 -s ours Change-Id: Idcde5d2977822b58383855325139a8f9257d7466
mentioned in commit 85cee730
mentioned in commit e7c399b8