Merge changes I8e432950,Id325b8cf am: 919ff2268b am: 9eec0a5c0e
am: cb77fb7c9a  -s ours

Change-Id: I2625d4a671a6a50f99ab99ffd72b96b83c601538