Merge changes I609c26d3,Id7aa1375,I3e39924c,I154ec761 am: d937c49b19 am: 7075ecb66d
am: a390ed0841

Change-Id: Iebfa0a7b7f5c5bc9288c6af7c37de9273e9195d6