Bug: 20816098 (cherry picked from commit 581f4e90) Change-Id: Ib7bd394a9dd0299f09d386ae010972b461217550