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

Change-Id: I99d6c5d14079fb369315d002d36d76629be12091