Bug: 24928722 Fix: 29871221 Bug: 31344846 Test: Builds successfully Change-Id: I870c71d537da79b9dd50f81ba5394eb8afc8d839
415f8b32e8