Merge changes If56cc9f1,I95bfcb59,I62021e0f am: 0ec224dd69
am: 8983e9ef36

Change-Id: If97448532d7403381967fa830ad5d8ed3de6c77d