Merge "[automerger skipped] Merge "[DO NOT MERGE]Using launchHomeActivity to replace pressHomeButton in setup." into pie-cts-dev am: d494e00ccc -s ours
am: 5a6de062c3 -s ours
am skip reason: subject contains skip directive

Change-Id: Ib3b831da13909846dd98c858fb975b1f86939d57