This reverts commit 10ead64346b2651be144ac591117cc2413d8caa3. Bug: 17475334 Change-Id: Ie7103a2ede1f00a91a2afc51d9e6ecf5ae569545
This reverts commit 10ead64346b2651be144ac591117cc2413d8caa3. Bug: 17475334 Change-Id: Ie7103a2ede1f00a91a2afc51d9e6ecf5ae569545