Bug: 150670922 Tag: #feature Sponsor: jpawlowski@ Test: Manual Change-Id: I4d4af980b1d41860b1d3fc7bf22aeb29e8615d41