Merge changes I20670684,If38c6d14,I94889125,I66169ed5 am: 85a6ca459f am: a1b9fbda53
am: ca7bea8c0a

Change-Id: I5eec36e674c381a68f4b4cb06cebcf92e0dfd972