Merge "Updating AppWidgetServiceImplTest as per Mockito changes" into oc-dev