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

Change-Id: I42986c29de95c67b315db6e0566a7176ce2ab666