Merge changes I20d546fd,I15363803
am: 632dbe2c77

Change-Id: I5fe86348657aa5e7f733be63c2134af4fe4a5365