Merge "Merge history of CTS" into stage-aosp-master