Revert Peek [2/2]

Change-Id: I6700e946db775f76aa5419c8a1d8152f646756a2
Merge "Revert Peek [2/2]" into android-4.4