Changes per LT-14628 Cancel Import

Change-Id: If8e730b295376435a512b7e0ba994358128d35c7