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

Change-Id: Ie1dad4f6d9516d0b40c90007ea7ce5b2f6c53e37