Merge "Merge "add a log for peek to shade expansion" into oc-dev am: 04298759fe am: 4bf303695b" into oc-dr1-dev-plus-aosp
am: 9de4174689

Change-Id: I8e9ab9456a0b1f6381dee4ce7fe40a313f23860d