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

Change-Id: I8549aa837ade3636532deeacb197037e6da131a8