Track the change in commit63a319201fand fix builds. Bug: http://b/29250988 Change-Id: Iad5be953e102020931649629afc980d585ed2931 (cherry picked from commitab2fb94bf4)
Track the change in commit63a319201fand fix builds. Bug: http://b/29250988 Change-Id: Iad5be953e102020931649629afc980d585ed2931 (cherry picked from commitab2fb94bf4)