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

Change-Id: Idd1a2bffd1425f541df6bea7c064fd9389a24638