Bug: 28599906 Change-Id: Ibe1001da94c7916761c8f3b4b5dbacd8cf3809a7 (cherry picked from commit 305ed710)