Merge "Update comment on why Keep is needed." into oc-dev
am: 696a83b0c7

Change-Id: I3d55f1601a6a491550f3d22fb66f4331ddad1eef