Fix D803

Change-Id: I3d2a5bf4c0b7c2e3686f74b5478f16f8ff08a817