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

Change-Id: I156f5acc74bd7bda77217698dd3756e2c729a035