Upstream commit: f76d10f3b6abad250d94b5b9a5c73faae6ce8cc5 Change-Id: I32f2690e36f444cae123134268472fb526c26163
Bug: 17473824 Change-Id: Id4c637733c491ac71bb6e269f55939c082fb0994