Upstream fix incoming This reverts commit 987ca6dec4. Change-Id: I3cec506b84cf1e469133df5276640d099e3c33de
987ca6dec4