Bug: 232940948 Test: manual with test app and added automated tests Change-Id: I30f5efefff7cf4fb0869188be78cc08e8efe7f04