(Cherry pick from commit b49dd577) Bug: 19525200 Change-Id: I940e25a6dd20d53d44ad8848f490ac18c5e971e9