Merge "isReservedSupported=true when running as container" am: e0076e4145
am: a228f69e07

Change-Id: I84eada2ee1e0f79985026ef382854bed752b5b26