Merge changes from topic "casework" am: 26b47227d2 am: 76ec879573

Change-Id: I1e55c53589de2c2d01a02d5d57ad4d359f1f093f