Bug: 18688119 Change-Id: I17fd89bfbb34666ad5e14bb6e946aa5347975d4c (cherry picked from commit b6107735)