Bug: 18103166 Change-Id: I95ecfa6dd605132dee57aa09d3bdc3cff97e5d3c (cherry picked from commit 88f2e67c)