Bug: 18069561 Change-Id: I9a8dbb7b991a3cbbcf53be01cd17b9bb5aa4591f (cherry picked from commit f570731f)