[automerger skipped] Merge "Create new context with new resources" am: 5a7efe50ec am: b776a67520 am: 7949f4e399 -s ours
am skip reason: Change-Id I6539817caa67e1100e50018fa0186993a1f56ccb with SHA-1 14747aa9fd is in history

Change-Id: I84b21571114eaca3118fdf9e3bd9e120ad2dce5f