Merge eab60c6f27ea5b23f77db084f18b104508119b5f on remote branch

Change-Id: Ifd8ff12948781d32acadd4090a2658aa6d1dd07d