Merge "Add check for null actions" into rvc-dev am: 4cb4f934be am: 798891f485 am: c23376fde0

Change-Id: Id7a18914c29e26dd686e62c708a32e8a62e97a54