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

Change-Id: I0354a83cbd86d89694b121228f40859a347307dc