0e9a59558b
with new logic from caf Change-Id: I9de48d2157ef3d8a35e7aa75061340a92f009ef6
with new logic from caf Change-Id: I9de48d2157ef3d8a35e7aa75061340a92f009ef6