Squash update from CM

Change-Id: I10bef13c3268194c2733f8f8814b66f956363c9d