Merge changes I33f0b3a0,I772b7981
am: b4406da4a5

Change-Id: If513e7528a851fd1f70f1a3acf2c711f8cbe4fa8