Needs a profile_assistant_test fix. Bug: 26719109 Bug: 26563023 This reverts commit 6caefd98. Change-Id: Ibdeb7385737dd7846ed861e0a95f083abb9aa974