This reverts commit 2290df3155.
Bug: 145257921
Reason for revert: Droidcop-triggered revert due to breakage, bug 145257921.
Change-Id: I95a27179083dbfbf5b3453ef3b45174f91594340
This reverts commit 2290df3155.
Bug: 145257921
Reason for revert: Droidcop-triggered revert due to breakage, bug 145257921.
Change-Id: I95a27179083dbfbf5b3453ef3b45174f91594340