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

Change-Id: I2f6339d74408a4a80fed4627f866f4c84ea887cd