Merge changes Ic3993c1f,I06645bb4 am: ac34e9aa3e

Change-Id: I4e11f42f1f302f8a08f60756cf08356aac8652cd