Bug: 18914409 (cherry picked from commit 98515951) Change-Id: If9b741ff8e09400a421e0a0ba1bc0d9ef13a9f99