Import db1858f6b9dec7ff54adf144f378679b405b8509 into master.
am: 8eb870d174

Change-Id: Ia181a5ab592450fcc8b1e1041b838871133e5ae3