am: febef177 -s ours Change-Id: Ie5f54f2e15dabca0020ac75d14aa8d962ef7c4e6
mentioned in commit 86766036