Merge "Change justification parameter from boolean to int." into oc-dev
am: 04fc05cd66

Change-Id: Ie4fcc93178abfb850068612b02cf3c82dba71377