This reverts commit 43d280a3. Reason for revert: The fix is made for this topic with aosp/798639 Change-Id: I405b6e05ddda7aff82aabd87328fb77b4112dc5f