Merge changes I7bd99fc0,I329bc929
am: deee2e12de

Change-Id: I52905bf3d6971332b216c8b5f18a695a4bbd23c5