Sync with compat lib.

Change-Id: Id8ace103814cf126f0d157100d1d4a12cc0b8664
5 files changed