Change-Id: I3974b754e0c81b79db972bb1bc958d84d7a02ec8 Fixes: 134067473 Test: In sample overlay app
mentioned in commit 372b769d