Test: manually on device Bug: 227717835 Fixed: 227717835 Change-Id: I4d796c3b7510baf07a670347fe4112a0b95d3036