Merge changes If9daee8f,I09ab3bfc,I854760bd
am: 32553d9b08

Change-Id: I999febe48580a315642cb65d0f87abc0346328d2