Revert "Revert Peek [2/2]"

This reverts commit f019f1e07cb282ac121b28a93368e18b43e0f937.

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