This reverts commit b63057e698.
Reverting this b/c http://droidmerger-01.mtv.corp.google.com:8888/googleplex/branch/lmp-dev
claims there's an automerge path from lmp-dev all the way to master.
Change-Id: Ia99a20410153442436ea836b5223a524b640dcbf
This reverts commit b63057e698.
Reverting this b/c http://droidmerger-01.mtv.corp.google.com:8888/googleplex/branch/lmp-dev
claims there's an automerge path from lmp-dev all the way to master.
Change-Id: Ia99a20410153442436ea836b5223a524b640dcbf