Merge "Fill in partial cherry-pick" am: 6b7dd3891d am: 08a40e51f6

Change-Id: Ic8a39842e04ae94d16bed500a7b32ba016307067