Reconcile with jb-dev - do not merge

Change-Id: Ie7428c559f53a12d88e9afdbd7234423881aed0f