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

Change-Id: Ia10f8d4b7211e64301bb0f9344db7e5e1f7bde20