bug:27939339 (cherry picked from commit 7982f347) Change-Id: I4b3a78dac338af51bf7c9ecb7a48d90aad370938