Merge "allow otasp activation for system user only" am: 0d3a5d78cf am: 297bdb1908
am: 1b298edaf9

Change-Id: I651cb3fb55f04f1d6b54b7275cfb337af5dd9778