am: 790c3431 -s ours Change-Id: I098c501721069dcbfe8dcce5fbdf9ef7a00765f2
mentioned in commit 732718f7
mentioned in commit 81ee5565