Merge "Added VirtualContainerActivityTest#testSaveDialogNotShownWhenBackIsPressed" into oc-dev am: 94074c39a2
am: 36b9a978a5

Change-Id: I73e2287e7a484e64110d80c033340eb2093035c4