Merge 3af7462ece4d881c7ea2acea065e3052240ee86e on remote branch

Change-Id: Iae40e614a40c1110876225a794584e0d8e8bec34