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

Change-Id: Ia7d3fae07dd242eda5337d1f25d0eb1ee95cae9f