Merge from goog/lmp-dev goog/lmp-ub-dev

Change-Id: I04c4169910fe5200532fcb9e3df8e22b77922e5d