Forgot to include MBQ's change :)

Change-Id: Id6cd79076e31ee53e6df77369e9ae7db9bb9ac96