This reverts commit e71fb7d2. This CL broke PDX unit tests Bug: 36587839 Change-Id: I5b3cb857aacff337cb9a268a0415f8398303abe8