(cherry picked from commit 40519cad) bug: 25862966 bug: 29497288 Change-Id: I45f121af61a81f4c18f90dcbddb752cd628f9bbe