Merge "Ignore class_{reset|start}_post_data on non-updatable APEX." am: 3f2d17632e
am: 90e29ac471

Change-Id: I85161e9ce50be3ac8a8751d87cc2aea1a647b040