Updated master manifest after jb-mr2-dev

Change-Id: Id7d916e67b61c10fa2dc1d1eb2dcb1e52f21d29d