Bug: 17565501 Bug: 18247218 (cherry picked from commit 9f60c08a446e38f9e2d5271546ef69ca5941eba9) Change-Id: I1ec32b318b6221277fc3ffbc19966bf3330c2d93
Bug: 17565501 Bug: 18247218 (cherry picked from commit 9f60c08a446e38f9e2d5271546ef69ca5941eba9) Change-Id: I1ec32b318b6221277fc3ffbc19966bf3330c2d93