am: 2cc8215a -s ours Change-Id: If0f817422cb3df1845f4999ebda64b45648996a8
mentioned in commit 9b0da2d1
mentioned in commit 86d33d14