DO NOT MERGE remove pts

Change-Id: Iab2fdae3692e3d4a716093749b65a3b4a7c5c735
182 files changed