Fixes: 27657256 Change-Id: I396eb9ba71f51fed517d7f958873369bc0ab011e
Bug: 27834471 Change-Id: I575040edcdf76124f21a667e64762acb86a65cb2