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

Change-Id: Ied34da2babeab17016a302aa0dbe858ae9b361a7