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

Change-Id: I0dba70d94710852d07fa3f141d61ed869756a379