Applies the fix in change Id91712fa to widgets. Bug: 2617318 Change-Id: I1e1dac6238a26497eacc23b161df171ae40bb588