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

Change-Id: I31392c70956503f6daa2ca2f62ca09836c4d5ef1