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

Change-Id: I6fa28e8fc16fda86c18a3a6454a85e99808f94f0