Merge changes Ib4459783,Ibb40f919
am: 0588f3aa44

Change-Id: I114de31c9d055f9f54643d4561661c15b1e075d2