am: e826b00b -s ours Change-Id: I420d53ec2da92b6ab7685593778fb5ffeca16388
mentioned in commit 6e6c3970