Merge changes

Change-Id: I7b71debb39f8dbdee978e39fe0fbc1d275809d05