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