Re-revert Android patch: Ticket #11913 changes.

Bug: 27855939
(cherry picked from commit bb572b8d9c31eac94db1a8e5de69e6fbbcab6de8)

Change-Id: Ic1b47f4330caf06dc76bfcf3da4970fe9f6b5a75
2 files changed