Merge "Make ion trace point optional" am: 22fe9b3c90
am: 422c18cc03

Change-Id: Iae1425336afae2ba9a5b4a7e80702b59d78f8a9b