Allow install non market apps (3/3)

Change-Id: I84603d422c550098924fc8d62cf5889a87bd0002
Settings: code cleanup

Change-Id: I788cfa394fb5243fb98116c20bb506404c424d29