Test: Manual bug: 141783130 Change-Id: I0c3e9041a2057ce721a608cf3a9f0a9bb15a2305 Merged-In: I0c3e9041a2057ce721a608cf3a9f0a9bb15a2305