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

Change-Id: I33cecff30f8af367b4d3fc40e58308b631743f4c