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

Change-Id: Ibc77edbc21b02981bc785edd454abe99278bd5b3