Partial-Bug: #1746514 Depends-On: I23359239008105cd77a599d2c08c067f132099b7 Change-Id: Iec9825169dcf0f902c57c057e5f375351cf752f2