Fix commit for ChaOS --> AOSP

Change-Id: I1f2b67299cf6fa6da55a81f89c1e0c840cf4abf4