Merge "Some refactor around default init location for picker." into arc-apps
am: 8dcbb75374

Change-Id: Id7fee6c9d57249e791e53c79113e9b1eca7db439