Merge "Not cache empty config bundle." into nyc-mr2-dev am: be0290f5f5
am: b7d1755a22

Change-Id: I4e375c041c9022f34772409a255b02f3e91c35ac