Bug: 28583844 (cherry picked from commit e7fda97f) Change-Id: I4a411184fe002ea812349e49d07d17c62c66d842