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

Change-Id: Ibd4ce263882aa431831c95cd7150bcf8fa54ed04