Merge a654b742250eaefc59698080581b0f4d1ae5870f on remote branch

Change-Id: Ice1ed4dcd949f34d93283971ff4f5fff059b306d