Merge changes I6eb07d50,I15cc1568,I70b7132f am: 3bca85a1e3
am: 5260d9aa63

Change-Id: Ia639f137d600c42c245b0925b638b3e5499c4144