Bug: 34700410 This reverts commit 970a66c972. Change-Id: I254d704eb4f456c07c6d6d270de830aef95d1f4a
970a66c972