Merge "Prevent crashes on null intent in Slice Builder" into pi-dev
am: 69fce6df71

Change-Id: I9a7e5a5531a81513fb7a0721d04a419cfe957295