Merge "Use both IMPORTANT and AUTO_CREATE flags" am: 193483f511
am: 46de3d7601

Change-Id: Ia6f7f53797d558cf0739703f8c90bd9419e57e2b