synced with beyond compare

Change-Id: Ia4b1cd52abf702f477883c50d9af9a39c151d282