Merge "Allow erase, set_active and download commands only on unlocked devices." am: e4046c7886
am: 8f701c905c

Change-Id: If206b065218d3fab62f0dc8efc9747620d894269