Merge changes I1846958e,I76a84710 am: 1ade5b7d8c am: efa26400cc am: 017aafdad3 am: 05e982d07f am: 04b572c8f5 am: cbb9ceaf57

Change-Id: I6efc2341d54f2e5d025907a4bd8243a1a29094f7