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