Bug: 16874785 (cherry picked from commit e0c56efddf) Change-Id: I9c922ba019f648766fc399d1c4e35e789e25acd4
e0c56efddf