Merge "Revert "Block allocateBackup if the node is not secure node."" into lmp-dev am: 323f6f51a6 am: c5e5b382fe am: 9dcb25476e am: f603689c7e am: 3b0cd870a1 am: 5b6cba8c2e  -s ours am: bedc4af45e am: 2f8f50198d am: 9521a42842
am: 4c7a2e2667

Change-Id: I77c82f8c05af222a212299d64823bff7c5108f25