Merge changes from topic "repo_diff"
am: 8ee1187ef5

Change-Id: I9e93bc660f32bca7b903acafd44ca4e86d6df37c