Bug: http://b/21640806 Change-Id: I778b35c8c7538859179e97fcf5a82db2fcd9e50f (cherry picked from commit 9cf6fc304b)
9cf6fc304b