Merge changes Ifb1b550c,Ic7377efc am: 11f8b20068
am: 360cd76695

Change-Id: I9c5f5a97718e43546c206c4a90e28adb1569602f