Merge changes I609c26d3,Id7aa1375,I3e39924c,I154ec761
am: d937c49b19

Change-Id: I12c47737271bfe35e03942fe3d0da3e727e2bf8c