bug:21869670 (cherry picked from commit 30451743) Change-Id: Ia18986797d166470801e7a9a690c054d2dc57952