fix some derps from 3.0.101 Upstream

Change-Id: I847a172c0c935e17bb48f661e5360bf493b5cbaa