Merge "Merge "Log what a shard executed" into oc-dev am: 1ab26c93ee am: ce686d4122" into oc-dr1-dev-plus-aosp
am: dff327730e

Change-Id: Ic74e63107a3ab3723635379616738c8053205ff3