If anyone has a better way of doing this it would be welcome... Bug: http://b/26936282 Change-Id: I796896866327b4b5b5ee4ec36994fb320993f85d