Fix: 408280336 Test: Manual Testing Flag: EXEMPT Bug Fix Change-Id: I20432ee13247bd4dbd089fc936476333900150e6