Merge changes I572ef7cd,I4bb036ab,Icb2b9bc1,I6c9d9b6e,I7e3d9c3b, ...
am: 8916483918

Change-Id: I12b62359b505ac2e5c0a685d23e9ad1d63c420d1