Merge 71fbe98d304a4dd0608e9fd4c245a65eff16bcff on remote branch

Change-Id: Id3c0d06ad12c2272761f369b1d83d635c74ad8a4