(cherry picked from commit 51a22a12ab) Bug: 17013324 Change-Id: I345c9d0fecc29d3626c5be01cc3c0ed1583ac361
51a22a12ab