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

Change-Id: I4f3bba6ede13af9140de86724e663eb0372a3ed8