Merge 1f80083e23233f8741042e328593a9b0690cd28e on remote branch

Change-Id: I0a6fe9332121cc584e72bce25b9af0dfbc3fffea