Fix mergeupstream

Change-Id: I15065e267cb7486b14e0b0a5790a910eb0ebd384