This reverts commit 28b4b34f92. Reason for revert: Software Cursor is not launching in Android U Test: manual Change-Id: I213cf64ca94fce51883a30a9d6b734b4ed874dad
28b4b34f92
1f7fab03c8