am 4951ebb9: am f372ba45: merge in KQS81M am: 3ac333722e

Original change: undetermined

Change-Id: Ib508d46ad03fbcbfd6d24c14adbd5c0873a507f1