Merge "Null check action cloning." into nyc-mr1-dev am: d0f20c2bbd
am: f1476d9189

Change-Id: I63d45d534c16205ca34595366cb3c99817606056