9df7fd5880
This branch now has the two fixes noted inline. Pull this in until everything merged to master upstream. Change-Id: I0aa4716ae26cf6fb8068665a1f21a7c66503bcff