Merge changes I3e6e5a22,I6eb3f066 am: 75836d5e7f am: 5966ae2c6b
am: 7cefb50abd

Change-Id: I57615d78807d3314eb9f248a2d66cf1e3e202981