Bug: 21209641 (cherry-picked from commit 38fafa18) Change-Id: If6d708307ba1ecdde6bf856d31dceac9ee782fb7