am: 501be370 -s ours Change-Id: Idcad9b117d031c28496a462bfe119d9505aa012e
mentioned in commit 2c77f7e4
mentioned in commit 2e68f736