synced with beyond compare

Change-Id: I6d723ffff844c120ff24583a66392cbcfb2302ab