Bug: http://b/27427439 Change-Id: I6294ff68a150bc9950a300264c31d2141307ac66 (cherry picked from commit f5e8f0b9cd)
f5e8f0b9cd