Fix merge issue from upstream

Change-Id: I255ebbd7c3ecbaa39dd92df8c168e75f30bfcf1b