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

Change-Id: I071c2cb6a52ef6bfefb93b8f1ecf2c805c78acf4