Merge changes If56cc9f1,I95bfcb59,I62021e0f
am: 0ec224dd69

Change-Id: If76b0241e3ca6899862a69d81c1ec398cca54f3e