Merge "Fix build - fix import of SettingsRobolectricTestRunner." into oc-dr1-dev am: 39efd4ec44
am: 8421bc0d29

Change-Id: Idd4c4eb94d2dde5ec9038c43271769db3d6064a9