Source update to ak-rb_jb_mr1.1-016-prima branch based on
ak-rb_jb_mr1.1-012.