BUG=18685222,17699796 Change-Id: I4b14b83eca7fe30e250e1252cb384bc94e05e0a4 (cherry picked from commit e0752553)