Merge changes from topic "repo_diff" am: 8ee1187ef5
am: a158515008

Change-Id: I13f3e8211f56e70eb3d2b1e84ed45f38fc0d3628