Merge changes I1c5b075b,I4bf5b314 am: 99e17ff8cb am: 78bd7eb032
am: 0fb5f0317d

Change-Id: I508edbc8702d0a07baeeb152e325ec465eebe063