Merge changes I220cb741,I471b2d19
am: 20ebcdca46

Change-Id: If13ec4fa1b2ba16b7b05dfd224d17d7bc5d95d57