Merge changes Ie89f709b,Ibf543a7d,I1d8092a1
am: 67897d47ce  -s ours

Change-Id: I92f71f1f89759f5f670577b87650141ebf859efc