This patch requires CL 744205 to be landed first. Bug: 22881983 Change-Id: I1bbce52e18719adcd09c7e70e09c37ec33387b04