Merge changes I9ad9b542,I2a4f4bb0 am: 58c78ab23c
am: f80ebfbb35  -s ours

Change-Id: I3fe0c389e3ebbdfdd67d946c4c239ab8e478179b