am: a0c00d58 -s ours Change-Id: I5b0212871aa8febc4551e0808509b3ce3654a2f3
mentioned in commit 95efd3c3
mentioned in commit 2594f7b8
mentioned in commit bbfbdb62