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

Change-Id: Idff85b167a76c6a1bda3fe7e1b5fd2a5cfc6eccc