am: 0bfed820 -s ours Change-Id: I0cc68643141fa8b526c58eeebede0aa324b12a34
mentioned in commit 68f7ee04
mentioned in commit 233897fc