Merge changes I978ac321,I5675a80c,I56ef3cc4,I1cdaf002
am: 2ff0a7bd58

Change-Id: I119ef6e1eccbf58f9b4a9b823e280148bfe1a77b