Bug: 21897404 (cherry picked from commit c08ab297) Change-Id: I66531379fb4468a8ddee063e664bf6593abbe7d5