This reverts commit 6a855191. Reason for revert: Last issue fixed with aosp/2875001 Change-Id: I961ea6d97c936df8a6475995b768a7eda861e6ee