Merge pie-cts-dev into master.

Bug: 112051819
Change-Id: Ifad8ff51837a046906549d305db755f3dad78b8a