Merge "Fix failing test."
am: f925be987b

Change-Id: Icefc97e10c5642031b760c18941eb6802711cd21