* Matches correct merge of LA.UM.9.14.1.r1-21700-QCM6490.QISI15.0. Change-Id: I36ed254e33a2030fa120b0900422ff0ddc8e9f7e