Merge "Create new context with new resources" am: 5a7efe50ec

Change-Id: I96de87ea8cf16800d0ea0ada34e2021ae4a99469