Bug: 17909204 (cherry picked from commit fdcbc5c4) Change-Id: Iea087560ba8b983412a6dde2ec166c9e7214f3a1