Merge \\"Work on issue #29328569: NPE in \\" com.google.android.configupdater\\"\\" into nyc-dev am: 6bc33b07f4
am: 3230838f91

Change-Id: Ieecd701765fcb9646b2dab92e004b556b9799900