Merge "Fix bug in DevicePickerFragment" into oc-dr1-dev
am: 0e467d594e

Change-Id: I692d1064b16ed98104eed14ec57caa250e2a703c