Merge commit 'a8d5644b548263d68e2c9bfff58958b29c3525ff' * commit 'a8d5644b548263d68e2c9bfff58958b29c3525ff': Fix issue 1985479 lots of backup NPEs.
Merge commit 'a8d5644b548263d68e2c9bfff58958b29c3525ff' * commit 'a8d5644b548263d68e2c9bfff58958b29c3525ff': Fix issue 1985479 lots of backup NPEs.