[automerger] All Apps physics polish. skipped: 2d5e0e067c am: 4da633ff34

Change-Id: I0f5287caf458b779f191a3eb567de05938fd4710