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

Change-Id: I18f2c599a38dc8bddd16571ff0def6a9f45d7fa4