Merge changes I70edafb7,I96cba65e,I5142a335 am: 1400acc159
am: 5ac8755ffe

Change-Id: I19b484668eeafe43f356ef3e13da33b51bb8c7ae