AOJP Common setting again

Change-Id: I28946e233f5240e49412a68416382e45a60e8597