Merge changes I50a2bc22,I9a97bf27,Id187e448,I572a5cf8,I389c3ab5, ... am: 048cb83ae6
am: 9bd1c14589  -s ours

Change-Id: I6cc03dda0ab00098f5818405ecf148883b17950e