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

Change-Id: Id2f4862faa57099d6b15f06567bdb53fd2f33b03