Missed a commit that fixed some issues. bug:5237167 Change-Id: I61e44831e2c3f1cf613ca1387aa95d712b7d2ded