This change is associated with Bug 21789313 and CL 718631. Change-Id: Ifb5db3d80fe01cc3f99000b812f9570777c39228