Merge "Future-proofing: change Alignment interface to abstract class and add a parameter for measurementType."