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

Change-Id: I8e7a14730697eb2e36a3dc4a5626f31adc78890a