54bbbdfa61
This reverts commit a04997b081.
Reason for revert: Platform master has API changes, and launcher-master should still map to qpr branch
Change-Id: Ib201c71b5557715d585d322ec2a1a528e352e61c