Bug: 21333911 (cherry picked from commit aafcfca5) Change-Id: I9832526a6d2996aadb459e3ec0930cbaf151478a