test changes from cm

Change-Id: I33474ea5856a91cf3244625cb5a1b3b8402435f8