Please refer to bug: 2979069 for the latest mock. Got rid of obsolete string too. Change-Id: Ic02d1651b288f24f9c3a9da5d0dcf09055256ab0
TODO: Cleanup will follow. Change-Id: I4a68ba9f2f55760aa24187f1f13fdfa8a0b70963