Bug: 6501927 Change-Id: Ia96ee076a5522c0ec1ce40d35ccc54d880fc86ab
Bug: 5738545 Change-Id: I20f31c4ff57a06e6df93ce3cfe4d032afd5bacc7