Merge changes I47bd6edc,I0e3e268d
am: c3e822bde4

Change-Id: Ie4c8adb9641c81153d7bc4932bcdc1ad0945a23e