Reconcile with jb-mr1-release

Change-Id: If51be7cdbb5f1d9fb187012805e25b05344c600a
Sync with jb-mr1-dev

Change-Id: I2c695b6f2ef93ac3108e2630970392563987e306
Reconcile with jb-mr1-release - do not merge

Change-Id: Ic9f7a63619c7f08e43a1c41ac8b9320f06091a66
Reconcile with jb-mr1-release - do not merge

Change-Id: I79234af97932b3d0f1bf4254132591d440635fc6
Reconcile with jb-mr1-release - do not merge

Change-Id: I599b8f1db757e4dee93e400f4ed925c5b4ffe5e4
Reconcile with jb-mr1-release - do not merge

Change-Id: Ic79ccb525e88f8f9cbc3e3deaa51271dea642b3b
Reconcile with jb-mr1-release - do not merge

Change-Id: If61aefc4d85c005115678123fc2ccbb1198abd81
Reconcile with jb-mr1-release - do not merge

Change-Id: Ib9d0b22d59b4990e88a74402eea4e46f9f24c243
Reconcile with jb-mr1-release - do not merge

Change-Id: I0952c3dbf0046dacd2909e81be11bf7a9cd09bf9
Reconcile with jb-mr1-release - do not merge

Change-Id: I6a234172a1ef826d6e6eb197e5328637a7419dda
Reconcile with jb-mr1-release - do not merge

Change-Id: I568de9bc7e549dea15084bcdd432708502c00186
Reconcile with jb-mr1-release - do not merge

Change-Id: I8f19d84c91be6611b5638879bd5e853a547021e2
Reconcile with jb-mr1-release - do not merge

Change-Id: Ib54d071739379a0efb0860ebd057f589e0087d67
Reconcile with jb-mr1-release - do not merge

Change-Id: Iac7c6ddfec2473dea0decf6aadf532a3b225d5a2
Reconcile branches

Change-Id: I6d3676c4e68cf0f3861353d879348210857374ca
Reconcile with jb-mr1-release - do not merge

Change-Id: I3b59c393204b71747bc8f2da83e353ff0a93a001
Reconcile with AOSP

Change-Id: I4e3101bef2a03647b44374cfcc80513caea44d29
am 79292f5c: Import translations. DO NOT MERGE

* commit '79292f5ca3a0836dcdf7d8808adda5ec9305395f':
  Import translations. DO NOT MERGE
am 0cf8d889: Merge remote-tracking branch \'goog/gb-ub-photos-arches\' into jb-mr1-dev

* commit '0cf8d889e414e4ddf1d4f5c2fe26fbf2870ddf67':
  Asset update for shutter; fix for capture
  Import translations. DO NOT MERGE
  Add VideoController to VideoModule
am 566b95c1: am 5fc4bd7f: am d97a4ef4: Fix the crash when choosing pick your video in effects recording.

* commit '566b95c17a1f302cc4bf42bbac1b5aca85f676dc':