682988ddde
* commit '08e9a0fd2e29405857c1b8c995937483a1599c4f': cherrypick Change-Id: I9e1b530b5cbd43043d326c04bfc30b073bf9d388 fix bug 3295540