[automerger skipped] RESTRICT AUTOMERGE Remove the possibility of an NPE that is being seen in master. am: 9ee4f596b6
am: f2a9e36cd3 -s ours
am skip reason: subject contains skip directive

Change-Id: I7c826eecfc599a0432c7ccd300f3454c3cd799e7