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

Change-Id: I01e878c4e7e6e5faba8e430696799a4489ff2c38