Merge "Modify test templates to prepare for stage 3 algorithm." into pi-dev am: 82aa849093 am: 92f6aa5f7c am: 459e556047
am: 3ab0821e27

Change-Id: I3a2f97ee39552532e6e2b09d19495c4939626903