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

Change-Id: I2c2152068b8169d3376039d439301187e0537836