Trying to fix diff upgrade

Change-Id: I0456a06d675e7e1a535669475a6216009be73430