Performance improvements by matmarex Change-Id: Ie89bd56702dec231a8c27f9cf8eeb7bbffe9b251
Bug: 49847 Change-Id: I4172445ed39525956b167cd8ee38bbfc676997f2