To match with the requirements of Id1c4e2c1 Bug: 6135881 Change-Id: If877fffb3863101edec2fa96f1fa4ae016c017f1