am 532c8600: Revert 21f0f97ebabb47adcbfe8d38b02685f2019b4eb3

Merge commit '532c86002bb89db43094b27ec50f001ae173c650' into gingerbread-plus-aosp

* commit '532c86002bb89db43094b27ec50f001ae173c650':
  Revert 21f0f97ebabb47adcbfe8d38b02685f2019b4eb3